from trunk
authorKenichi Handa <handa@m17n.org>
Tue, 2 Feb 2010 04:15:15 +0000 (13:15 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 2 Feb 2010 04:15:15 +0000 (13:15 +0900)

Trivial merge